Auto merge of #1196 - alexcrichton:issue-1187, r=alexcrichton
authorbors <bors@rust-lang.org>
Tue, 20 Jan 2015 00:38:16 +0000 (00:38 +0000)
committerbors <bors@rust-lang.org>
Tue, 20 Jan 2015 00:38:16 +0000 (00:38 +0000)
commit9fcc37083cba470c7ddaebac6c3b37e89f1d90de
tree7c71406a5fb505fd9472f7cd3c97ff219c5f9ca5
parent73b904c05e1a4504591da65d1c4f733b558d5908
parent04404d14ab3124f30a63068d75156dc6b7234745
Auto merge of #1196 - alexcrichton:issue-1187, r=alexcrichton

Closes #1187